Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

br/operator: fix adapt env for snapshot backup stuck when encountered error (#52607) #56717

Merged
merged 4 commits into from
Oct 22, 2024
Merged

br/operator: fix adapt env for snapshot backup stuck when encountered error (#52607) #56717

merged 4 commits into from
Oct 22, 2024

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Oct 18, 2024 •
edited by YuJuncen
Loading

This is an automated cherry-pick of #52607

What problem does this PR solve?

Issue Number: close #52049

Problem Summary:
When we failed to prepare the connections for wait apply, the channel may never be closed. Hence the pause PD operation (which relies on the finishing of the prepare connections stage) get stuck.

What changed and how does it work?

Selected over the context so it can be canceled.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test

    The change is almost trivial.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.1 This PR is cherry-picked to release-8.1 from a source PR. labels Oct 18, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request Oct 18, 2024
Merged
12 tasks
@codecov Codecov
Copy link

codecov bot commented Oct 18, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 10 lines in your changes missing coverage. Please review.

Please upload report for BASE (release-8.1@c08ecf1). Learn more about missing BASE report.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-8.1     #56717   +/-   ##
================================================
  Coverage               ?   71.1923%           
================================================
  Files                  ?       1466           
  Lines                  ?     423218           
  Branches               ?          0           
================================================
  Hits                   ?     301299           
  Misses                 ?     101408           
  Partials               ?      20511
Flag Coverage Δ
unit 71.1923% <0.0000%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.9656% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 41.3055% <0.0000%> (?)

YuJuncen and others added 4 commits October 22, 2024 03:28
@YuJuncen @ti-chi-bot
fix adapt env for snapshot backup stuck when encountered error
ab7cd3e 
Signed-off-by: hillium <yu745514916@live.com>
@YuJuncen @ti-chi-bot
added a test csae
921cbe1 
Signed-off-by: hillium <yu745514916@live.com>
@YuJuncen @ti-chi-bot
make bazel_prepare
dc19112 
Signed-off-by: hillium <yujuncen@pingcap.com>
@YuJuncen @BornChanger @ti-chi-bot
Update br/pkg/backup/prepare_snap/prepare.go
af4cab2 
Co-authored-by: BornChanger <97348524+BornChanger@users.noreply.github.com>
@ti-chi-bot ti-chi-bot force-pushed the cherry-pick-52607-to-release-8.1 branch from 2d4c442 to af4cab2 Compare October 22, 2024 03:28
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Oct 22, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 22, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BornChanger, YuJuncen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 22, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 22, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-10-22 03:37:16.375435009 +0000 UTC m=+322237.072225618: ☑️ agreed by YuJuncen.
  • 2024-10-22 03:49:18.459323387 +0000 UTC m=+322959.156113998: ☑️ agreed by BornChanger.

@ti-chi-bot ti-chi-bot bot merged commit 532ca35 into pingcap:release-8.1 Oct 22, 2024
28 of 34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BornChanger BornChanger BornChanger approved these changes

@YuJuncen YuJuncen YuJuncen approved these changes

Assignees

@YuJuncen YuJuncen

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.1 This PR is cherry-picked to release-8.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @YuJuncen @BornChanger